Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

v1.16: ci: fix audit (backport of #32932) #33007

Closed
wants to merge 1 commit into from
Closed

v1.16: ci: fix audit (backport of #32932) #33007

wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 25, 2023

This is an automatic backport of pull request #32932 done by Mergify.
Cherry-pick of e4a2d14 has failed:

On branch mergify/bp/v1.16/pr-32932
Your branch is up to date with 'origin/v1.16'.

You are currently cherry-picking commit e4a2d14c4e.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   Cargo.lock
	both modified:   ci/do-audit.sh
	both modified:   programs/sbf/Cargo.lock

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

@yihau @mergify
ci: fix audit (#32932)
9864037 
* ci: bump rustls-webpki to 0.101.4

* ci: ignore RUSTSEC-2023-0052

(cherry picked from commit e4a2d14)

# Conflicts:
#	Cargo.lock
#	ci/do-audit.sh
#	programs/sbf/Cargo.lock
@mergify mergify bot added the conflicts label Aug 25, 2023
@mergify mergify bot assigned yihau Aug 25, 2023
@willhickey
Copy link
Contributor

Whoops, this has already been done in #32948

@willhickey willhickey closed this Aug 25, 2023
@mergify mergify bot deleted the mergify/bp/v1.16/pr-32932 branch August 25, 2023 21:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@yihau yihau

Labels
conflicts
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@willhickey @yihau